From 5c71539c263da8502414577eb7ab51c70dece8b2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 8 Jan 2002 23:05:46 +0000 Subject: [PATCH] Handle TOGGLE/RADIOBUTTON as well. (#68201, Damon Chaplin.) Tue Jan 8 18:04:01 2002 Owen Taylor * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): Handle TOGGLE/RADIOBUTTON as well. (#68201, Damon Chaplin.) * gtk/gtktoolbar.c (get_first_child): Fix stupid bug, just introduced. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtktoolbar.c | 6 ++++-- 8 files changed, 67 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8ffd41af97..f5ec51db73 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Tue Jan 8 18:04:01 2002 Owen Taylor + + * gtk/gtktoolbar.c (gtk_toolbar_set_icon_size): + Handle TOGGLE/RADIOBUTTON as well. (#68201, + Damon Chaplin.) + + * gtk/gtktoolbar.c (get_first_child): Fix stupid + bug, just introduced. + Tue Jan 8 15:53:28 2002 Owen Taylor * gtk/gtkdnd.c (gtk_drag_find_widget): Fix coordinate diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 9c9b3fe76c..5517417bf8 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -981,7 +981,9 @@ gtk_toolbar_set_icon_size (GtkToolbar *toolbar, for (children = toolbar->children; children; children = children->next) { child = children->data; - if (child->type == GTK_TOOLBAR_CHILD_BUTTON && + if ((child->type == GTK_TOOLBAR_CHILD_BUTTON || + child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON || + child->type == GTK_TOOLBAR_CHILD_RADIOBUTTON) && GTK_IS_IMAGE (child->icon)) { image = GTK_IMAGE (child->icon); @@ -1605,7 +1607,7 @@ gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar, static GtkWidget * get_first_child (GtkContainer *container) { - GList *children = gtk_container_get_children (children); + GList *children = gtk_container_get_children (container); GtkWidget *result = children ? children->data : NULL; g_list_free (children); -- 2.30.2